[TRAIN-3456] Add healthchecks. Add functionality to Makefile. #122

briannadelvalle-datadog · 2025-10-15T20:42:04Z

Description

Use healthchecks instead of wait-for-it -- reduces chance of bad race conditions breaking storedog in labs
Add Makefile functionality
Add scripts to generate docker-compose.yml files from docker-compose.dev.yaml. (One is intended for pre-release, another is for testing the frontend prod build target while using the dev docker compose file.)
Update readme and add service-level readmes (and a FEATURES.md file)
Improve frontend service image: multilayer builds, use build targets
Add a simple env.development.template for TCD use.

Frontend build times

Tested with the help of Cursor/Claude.

Dockerfile	Clean build	Build env vars change (second build)	Source code change (third build)
Production build target	39.35s	8.01s	9.67s
Old Dockerfile	47.43s	27.48s	18.90s

Image Sizes

Tested with the help of Cursor/Claude.

Dockerfile	Size
Production (Multi-stage)	301.4 MB
Old Dockerfile (Single-stage)	812.8 MB

How to test

Test the healthchecks

Run make up to build the dev containers.

Test the frontend prod build target

In the Makefile, set ENV=dev-frontend-prod.
Run make up clean.

Test the dockerfile generation script

Run make prepare-release.
Check the docker-compose.generated.yml file and answer Y/N in the terminal.

Test the Makefile updates

Run make help to see the commands.

…tation; add transform_compose.py script and unit tests for compose transformations.

…ddprofrb for profiling

…nction for generated files in transform_compose.py

…put setting in next.js for prod build

…production frontend build

…rget, and build args in docker-compose template; refine regex pattern for build section replacement in transformation logic.

…opment and production environments, including environment variable configurations and dependency installations.

… function for selecting the appropriate Docker Compose file based on the ENV variable. Simplify commands for starting, stopping, and managing containers in both development and production environments.

…ariables for frontend service; add port mapping for local development.

…th NEXT_PUBLIC_DD variables for frontend service configuration.

…ment to production

…nv var stuff to env templates, move feature stuff to feature.md

…BLIC_DD variables for consistency in frontend service configuration.

… with NEXT_PUBLIC_DD variables for consistency in frontend service configuration.

briannadelvalle-datadog · 2025-10-20T21:12:21Z

services/frontend/components/common/Ad/Ad.tsx

      console.error(e)
      setLoading(false)
    }
-  }, [adsPath, getRandomArbitrary, setData, setLoading])


React said that this wasn't needed here.

Makes sense, it's not a dependency

briannadelvalle-datadog · 2025-10-20T21:12:42Z

services/frontend/Dockerfile

@@ -1,29 +1,134 @@
-FROM node:20 AS builder
+FROM node:lts-alpine AS base


To mitigate a security vulnerability in other image

…ckerfile

briannadelvalle-datadog · 2025-10-21T19:27:06Z

services/frontend/next.config.js

@@ -1,4 +1,5 @@
 module.exports = {
+  output: 'standalone',


This is for the optimized production builds (production build target)

… NEXT_PUBLIC prefix and enhance transformation logic for development to production changes.

arosenkranz · 2025-10-21T20:23:35Z

.gitignore

+
+settings.json
+
+docker-compose.dev.frontend-prod.yml


Was this last one left here on purpose?

Yeah, this is only for testing the frontend prod build target.
Can't test it with the regular docker-compose.yml because it's not in the storedog image.
Can't test it with the docker-compose.dev.yml because of the volume mounts.
I'm adding a script and a make command to generate this file, but there's no reason to add it to source control.

For more context, the prod build creates a server.js file and the command is node server.js. If we're mounting the entire service directory, we end up losing that file.

arosenkranz · 2025-10-21T20:30:19Z

docker-compose.dev.yml

    labels:
-      com.datadoghq.ad.logs: '[{"source": "python"}]'
+      com.datadoghq.ad.logs: '[{"source": "python", "service": "store-discounts"}]'
+      com.datadoghq.tags.env: '${DD_ENV:-development}'


Is there a reason we're adding service level com.datadoghq.tags.* back in some definitions and not others? IIRC we removed them not long ago because Shawn said they were redundant if we had proper labelling elsewhere (e.g. setting DD_ENV at the agent-level means all other services will follow suit).

I could be mistaken on this, and keeping them doesn't do any harm, so not really a blocker imo

I think this was an accident on my part. I was using my RUM course's branch as a starting point, but there have been updates since that branch was made.

arosenkranz · 2025-10-21T20:35:50Z

.gitignore

+
+
+.gradle/
+Gemfile.lock


You remove Gemfile.lock but since it's already been checked-in, it won't retroactively ignore it. Need to either delete the file (this is fine, because the docker image sets it up anyway) or reset the git cache so the .gitignore gets adhered to.

Also, I think to avoid this in the future, we should probably create/update a .dockerignore file that has node_modules, .git, and Gemfile.lock

lol oh yeah duh 🤦 ... I don't know enough about Gemfile.lock. Is that something we want under source control?

…g, and improve documentation for better usability.

…og configurations for cleaner logging setup.

…, simplifying the setup for Datadog logging.

…et to simplify usage instructions.

briannadelvalle-datadog added 30 commits October 6, 2025 10:15

Remove wait-for-it, add healthchecks. Add functionality to Makefile.

4bf5895

Enhance Makefile with prepare-release target and improve help documen…

e4134a8

…tation; add transform_compose.py script and unit tests for compose transformations.

add healthchecks to docker compose.dev

a6b1bf3

Update Dockerfile to change command for starting Rails server to use …

f6a8fde

…ddprofrb for profiling

Add .gradle/ and settings.json to .gitignore

d4b6dea

Refine regex pattern for service build replacement and add cleanup fu…

09e31a5

…nction for generated files in transform_compose.py

Update docker-compose.yml

39affb1

Use dev and prod Dockerfiles for frontend service, use standalone out…

5db6be7

…put setting in next.js for prod build

Add basic dev env template for faster setup

f27ce66

Update frontend dependencies

5d779b7

rename frontend Dockerfile

ea08f34

Update frontend README with info about different Dockerfiles

7828c9c

Use build targets instead for frontend

5c37db8

Add frontend build target to env template for development testing of …

a25a20b

…production frontend build

Enhance frontend service configuration by adding dockerfile, build ta…

1757a79

…rget, and build args in docker-compose template; refine regex pattern for build section replacement in transformation logic.

Add Dockerfile for frontend service with multi-stage builds for devel…

5d171ff

…opment and production environments, including environment variable configurations and dependency installations.

Refactor Makefile to streamline environment handling by introducing a…

154cd1a

… function for selecting the appropriate Docker Compose file based on the ENV variable. Simplify commands for starting, stopping, and managing containers in both development and production environments.

Update docker-compose files to include build target and environment v…

1aa9648

…ariables for frontend service; add port mapping for local development.

Merge remote-tracking branch 'origin' into TRAIN-3546-Update-Storedog

9d74142

Update default values of development stage variables

77ca5d3

Clarify some comments in env.template

c4bd25d

Add or update readmes for services

6225944

Update env templates

923bf2f

Update docker-compose.dev.yml to replace RUM environment variables wi…

666d8c7

…th NEXT_PUBLIC_DD variables for frontend service configuration.

Move features info to separate .md file

6935f1a

Update Makefile to support no-cache builds and change default environ…

3dc049e

…ment to production

Update readme. Move service specific stuff to service readmes, move e…

54d38b2

…nv var stuff to env templates, move feature stuff to feature.md

Update README to include a blank line for improved readability

3c610bd

Remove some console.logs

795cca3

Refactor Dockerfile to replace RUM environment variables with NEXT_PU…

40e275e

…BLIC_DD variables for consistency in frontend service configuration.

Update test_transform_compose.py to replace RUM environment variables…

c4d6664

… with NEXT_PUBLIC_DD variables for consistency in frontend service configuration.

briannadelvalle-datadog commented Oct 20, 2025

View reviewed changes

briannadelvalle-datadog added 7 commits October 21, 2025 12:52

Adjust frontend Dockerfile to match vercel example

124d848

Frontend command var made obsolete by build targets and multistage Do…

0c37cee

…ckerfile

Add unit tests for frontend and compose transformation scripts

68e2984

Improve makefile

1fe98d0

Update dockerfiles

7d4aca1

Update .gitignore

5e305e9

Update some documentation

14961cd

briannadelvalle-datadog marked this pull request as ready for review October 21, 2025 19:25

briannadelvalle-datadog requested review from a team as code owners October 21, 2025 19:25

briannadelvalle-datadog commented Oct 21, 2025

View reviewed changes

Remove variable that's no longer needed

74a4c26

briannadelvalle-datadog marked this pull request as draft October 21, 2025 19:52

briannadelvalle-datadog added 2 commits October 21, 2025 16:22

Align frontend variables, don't use args in docker compose

7768d16

Refactor environment variable handling in Docker Compose files to use…

e62336c

… NEXT_PUBLIC prefix and enhance transformation logic for development to production changes.

arosenkranz reviewed Oct 21, 2025

View reviewed changes

briannadelvalle-datadog added 4 commits October 22, 2025 12:56

Refactor Makefile to streamline commands, enhance environment handlin…

894ddba

…g, and improve documentation for better usability.

Refactor Docker Compose labels to remove service names from Datadog l…

5953204

…og configurations for cleaner logging setup.

Refactor Docker Compose log configurations to eliminate service names…

d6c8e53

…, simplifying the setup for Datadog logging.

Remove one-time override instruction from Makefile frontend-prod targ…

6a091db

…et to simplify usage instructions.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

[TRAIN-3456] Add healthchecks. Add functionality to Makefile. #122

[TRAIN-3456] Add healthchecks. Add functionality to Makefile. #122

Uh oh!

briannadelvalle-datadog commented Oct 15, 2025 •

edited

Loading

Uh oh!

briannadelvalle-datadog Oct 20, 2025

Uh oh!

arosenkranz Oct 21, 2025

Uh oh!

briannadelvalle-datadog Oct 20, 2025

Uh oh!

briannadelvalle-datadog Oct 21, 2025

Uh oh!

arosenkranz Oct 21, 2025

Uh oh!

briannadelvalle-datadog Oct 22, 2025

Uh oh!

briannadelvalle-datadog Oct 22, 2025

Uh oh!

arosenkranz Oct 21, 2025 •

edited

Loading

Uh oh!

briannadelvalle-datadog Oct 22, 2025

Uh oh!

arosenkranz Oct 21, 2025

Uh oh!

briannadelvalle-datadog Oct 22, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		@@ -1,29 +1,134 @@
		FROM node:20 AS builder
		FROM node:lts-alpine AS base


		settings.json

		docker-compose.dev.frontend-prod.yml

Uh oh!

[TRAIN-3456] Add healthchecks. Add functionality to Makefile. #122

Are you sure you want to change the base?

[TRAIN-3456] Add healthchecks. Add functionality to Makefile. #122

Uh oh!

Conversation

briannadelvalle-datadog commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Frontend build times

Image Sizes

How to test

Test the healthchecks

Test the frontend prod build target

Test the dockerfile generation script

Test the Makefile updates

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arosenkranz Oct 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

briannadelvalle-datadog commented Oct 15, 2025 •

edited

Loading

arosenkranz Oct 21, 2025 •

edited

Loading